Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Feb 2012 00:04:09 +0000 (16:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 23 Feb 2012 00:04:09 +0000 (16:04 -0800)
commit96067e3596b124c5fc208b5e1a284c5280c74b74
treef05deab274a4220c9dacb81b58a12b0ed08e7b66
parent350cbe17204345f46e9a5703f4aaca33d933b546
parent4bc083379fbf9ec5970cd7adc8ebc21887ae0aa5
Merge from trunk.